A little more gen work
Merge branch 'master' of https://github.com/ThatHalfKorean/CMSI488