Finished

Completed code, cleaned up, and fixed issues.