last bit of changes

dev will pause here as it's working for the need of the live wsumage server that is up.  Will work on more abstraction later