refactor: Lots 'o junk

Working on complete refactor...