Work in progress. Committing before removing commented code.