Reorganise objects implementation. Maybe getting somewhere.