Reverted changes so they are more in line with Dr. Ouyang's specs. Added new constructor. Still need to work on other functionality.