Fixed merged conflicts....... this should be good to go, clock on and everything