WIP
Much better; still not quite there