Still some bugs, but things are looking better