Fully functional and fixed project 2