Add missing files and comment out calls to stuff I'm not ready to support yet