Latest code

- includes location parser changes
- includes windows printing fix
- includes modularized code