Assesments 8.4-5 and finish/fix Main