checkin before some latenight edits
new approach/design. fixed some bugs
merge some new things
minor tweaks before bed. prepped for tomorro
commit before a quick pull check