[WIP] Initial commit

Somewhat simpler than last time.