adding basic support for transitions
support for resolving data
support for resolving data