renamed class and added simple control system