Work in progress. Like the worst commit message ever :)