- Moving constants out to a header file

- Adding flag to switch coordinate systems (although flag seems inappropriately placed)