Compiles again with all features added.

Next need to write some more vigorous tests using DataTables