Trying again; I really hate polluting the git log with these attempts, but c'iest la vie