Added template for assignment 8, fixed consistency issues