WIP: comment out a lot of incompatible stuff