Started major re-write to include assembly sets

Also added supported for different element types