adjusted to span all 12
removed TODO
started adding presence