Updates

All bootstrapped now

* From here on - each function should include yard
* There should be tests