Closes issue #6

Also added timer and better movement.