Lot of changes. Added ability to change controls