merged in my branch 'resources', which is not aptly named anymore since it no longer...