full overhaul

reconstructed classes and cleaned up flow, made more efficient. debug on
containers + still needed
deletion of old files