latest and greatest, fixed some build issues
removed enum (not necessary)
work in progress