Added in a couple uAborts
Merging some crap here
Merge branch 'master' of https://github.com/spqchan/cs343soda