Initial version of add to fixed TS + Refactor

* Add works, i think?
* Adding tests too
* Decided to make private functions start with an _ also