Continued the work on converting to proper docblock commenting..