Plugin and demos all working for now