Commented out the time stuff for now, just want to clean up the code before I proceed any further.