added initial aspects
cleanup
Added time provider