More control

Added controllers. Location and company changes.