Finished blocks Gabriel was working on

Also added some comments