Updated the entire thing. Still has some work to do regarding markup.