dev6 - Object implemented + improvements