Finished project 4 implementation stuff