Work on pushing offline images up to the server
Code cleanup