Clock up working, now need to clean up