Fixed build

--Time to re-add all the features