Committing before I make some pretty experimental changes.