Reimplemented Affects to be more modular #106