Better modularise code; add a revised list of rebsites that resolve.