added annotations and started with start/end functionality