Prep intermediate checkin (so I don't nuke stuff).
Basic package complete. Need to make sure the docs work.
Pretty satisfied with this.