Changed it all... lots of reworking, but I like the core concept now.