Hopefully on the way to something working...