Commit before Code gets messed up
Semi working atm need to refactor