Redid these for version 2.0, couldn't decide which one. Taking suggestions here, if you wanna help me decide!
