Attempt #1 at fixing project.