Moved stuff around. Slight modifications. Added methods in controllers for future use.