Still some major issues, but getting pretty close!