TEMP COMMIT (code review & some continuation work, on a hot sunday of summertime)