lil more cleanup + prototyping, it's dinner time now