commented basic logic code
commit
Merge remote-tracking branch 'origin/barend's-changes' into nicks-changes
nearly completed