added ui code
stuff
Updates to Code --Ben
Merge branch 'master' into dev