Working version

Minor bugs fixed
Meets all requirements for project