removed dist stuff, added idea for better class design