Extract classes
Added preliminary commands