Finished 81 and 31
Merged