Got something working but it's not quite like it should be