Add types, allow for subroutines.