Yet another rewrite!! Starting this time with Sectors.