moving stuff to be more oo
found out where all the times are being set the same
non-workingsolution
adding comment count, need to do client side
minor tweaks
fix merge conflict
Fix merge conflict
Merge branch 'more_debugging' into development
fix second merge conflict