Finally got the project to a place where I am "happy?".