Started removal of bs2 compatibility & work on ng

Closes #669
Closes #651
Closes #654