Neatened up the code
Started on a timer