More progress debugging, starting to readd btree functionality