Almost all done. All save the server... and the push