Started 2.3

Added lots of old things which I forgot to push
Started work on EffectLibrary support