More work on bug #8366.  I rearranged how the code is layed out, and added hours by Project Type.