removed all the yak shaving I did. Prep for refactor/redesign.