WIP refactor
WIP styling
fix mergies
fix mergies
update js to be nate's version