Work in progress. Just committing so I can work on it remotely.