Major changes to class definitions
Rough implementation of overlaying for the obs list