Fix it up so that it works .. finally. Ready for squashing now :)