Added control class, and logging