removing timemodel
added basic highlishing functionality