Stable

Going to try to consolidate classes and clean up the approach