Moved control to own lib for some reason