File paths are grabbed from objects.properties now rather than hardcoded in
Fixing merge stuff