Code is now running, need to fix bugs and logic