Need to change these all to not involve decorators, if we are indeed dropping them.