continue work on buildout
lots of changes to get plugin up and running