More or less complete

Assignment seems more-or-less ready