Little bit of clean up and trying to organize for public viewing