modals almost complete. safety commit