Split up things better, add some minor tasks for added interactivity