Remove old dep
Interrim commit

* Minor clean up
* Use destructuring
* Starting to mess with Om side of things