changes for field testing
worked on play stuff
fixed the merge
features