initial hacking
first cut, hacked together at the summit. See todos for next steps