Primarily a lot of work on forking the type hierarchy