Chris adding some stuff in

stuff i've been working on locally
Merge pull request #1 from CCWest/master

Chris adding some stuff in