Added, refined, tested and corrected models

Tasks models still to be trimmed.