First thoughts.
Merges in master, adds totally new marketing page at the same time. Oops.