refactor and import wjbb_data etc