finished up my first pass at the project.