Added features from @tayzlor sandbox