Allygen

I'm just merging these two branches because I suck at branching. XD