Things all work now
CDI stuff in place

This blows up starting tomee... haven't figured out why.