Moved over some reply to code to component system.

Still need to do the jsp.