WIP, close but getting odd results