Coreyk

Lots of changes see commits--