Make observer a class