Made an abstract supermapclass
Removed lost searchcode from branch