back at it, cleaning up/rethinking controllers
convert marker to directive
Change time scaling to be consistent
updte from old computer