Migrated over to Dmitry's buffer range. Lots of stuff is disabled for now