added a butt load o' stuff!