Removed resources-psas folder I previously created.
Moved Position_X and Position_Y into the 'extra' calculations
Apparently I forgot to push the messages.properties file