Carlos

Taking carl's stuff, refactoring, and inserting into the main page