Ok. this seems to workish