Coordinate changes by Swayam, Avery and Tianchi

Reverted Swayam's changes
- Pass in specific state information instead of entire state as parameters into methods in Constants
- Add some new constants in Constants

Combined with Avery's and Tianchi's updates.