Just commiting because I am to a better point ... not a clean build ... still need some plugins and bugs squashed.