Work on data entry, getting tests running, aligning recent updates