* wip

* more

* more

* remove unused imports

i screwed up when I did the merge

* wip

* remove extra parentheses

* wip

* minor formatting

* wip

* wip

* wip

* wip

* wip

* minor formatting