Small update, but still not even half done though