Re-add deployment

Fixes #17 

Also added simpler types based on Element.