Starting on track markers
Some tidy up, added in a few bits of adding markers