more later, got the time part working well