Final project

All comments are in and code is set