Major stuff working, CSS edits tomorrow