Added some of the ideas from the guys in the #direwolf20 IRC channel :D