First totally working version of project 3 push