final commit on this assignment on my part, the rest is for the team