Need to finish addrspace code