Granted, you did not have this information from my original post, but this was a 1 year project with 13 people, and it was pretty sure that this project would be continued after the 1 year project.

But oh well. more refactoring fun for me, I guess.