Removed Staff Class, Improved Models, Added Much-Needed Comments.