Ported over

Brought over to use btools v1 now
Removed submodule (added wrong one!)