Much better run than the previous but still pretty sloppy, I can do better than this :/