Initial client side work

Brings `master` up to date. Initial version ready for deploy.