Feature/edit time

Closes #221.

Could use some refactoring eventually.