More style edits
Add tests
Add vendor stuff