First pass at cleaning this project up.