moved some things into client/startup