Implemented finalized controls and cleaned up codebase.