Re-add deployment

Fixes #17 
Fixes #18 
Also added simpler types based on Element.