Start with EXTREMELY UNFINISHED rewrite

- pushing because I'm switching machines