Total re-vamp based on brainstorming session. Woot\!