herp
manual merge, forgot objects.js