still cleaning up, making clock