add time conversion
more stuff