More progress! It seems to be getting towards working!