Started work on startup code