todo updated, test model manipulation and comments