I still need to fix the mobile-ish navigation but other key bits are in place