Still not functional - at least everything is right-side up now