Refactored
TODO notes
Updated project files