Made it all work on startup