* Added Object baseclass

 * Code cleanup