Vision and parking merge

This merge adds Aldric's vision and parking types to the main spec.  It also cleans up interfaces' inheritance.