Continued to work on refactor of bibframe