About to try something stupid so I commit is needed :)