Finished POJO refactor; old functionality now works