Rearranged so that I can use JSP's in the future rather than HTML