3.0.0 wip

updates w/o finished unit testing