* Added code * Got it working * Added test and refactored test code * Removed comment * Cleanup * Code formatting