Begin separating into classes