Commented out includes of missing files - waiting for latest push from Kyle