Got everything to compile, adding features next