Worked more on User types and created traits.. I'm probably over-doing it, but we'll see where this goes, I may just revert things back if they get too complicated. It's late and I was feeling adventurous