Todos

@mkwiatkowski 
Fixes #10 
Hmm, okay. Yeah I struggled with the time remaining implementation. I must be over thinking it or something.