Commit what I have so far, even if half-baked.