Added too much stuff (1.1.0 ALPHA!)