Closes #3, everything done.

Only redesign tweaks left.