Removed the contact stuff
Updated time tracking