Fixed major potential glitch

Also started to pencil in timer