refactor a lot, seems poor planning and poor commit discipline has gotten me. i shall be avenged