Got some loading bar action, but it's still buggy