Finished

Resolved all issues with code