FIX OO in classes, and UI layer changes

This Isn't Even My Final Form