Complete assignment module - but templates need modif