Restructuing, nom q, db calls, time sheets. need to fix restructuring errors