Migrate some things to resources

just testing