@WIP: should strip out DateTime support instead