Tweaks to code
Broke into two packages