Adding Startup stuff, this is already included in my other repo