Added the few features that work