Cleaned up items drastically (slightly drunk Rob so @dmillerw may need to look over this code)