Added lots-o-stuff