Updated master with all current progress manually, since I can't figure
out how to use the branch merging feature.