safety commit

In the middle of working on individual field rendering methods.