WIP: Less requests on startup

Description will follow, just checking travis atm.