Add a Block enum type which will eventually represent all possible block types#13