* General Tidy up, change to remote database