Now factoring out cyclone classes and reworking them with mine to trask errors in code