revert last commit; gonna fork so i can make some major design changes