Done-ish

Something's coming together here. Check back soon.