my work in progress
current progress
resolved conflict
scans not yet working