restructured and added User control
merge Mike and Dave