Update from the road to Albany - Homework #2

Last need more forking and lint.