Messed around with things, slightly closer to working