Coreyk

Lots of changes!