Did a little cleanup of objects, converted the EtaObject super-class to an interface instead, making it way more flexible