Revert "Initial xpos/ypos Edit"

This reverts commit abe99f68066051a5cfa43a096c0c837bf2fa4c60.
Revert "Revert "Initial xpos/ypos Edit""

This reverts commit 83f03c018ae0c2a1ef3f860d7d18a8ba43e5a0dc.
Revert "Initial xpos/ypos Edit"

This reverts commit abe99f68066051a5cfa43a096c0c837bf2fa4c60.