Committing some half-finished things, mainly for backup purposes.