Reformatting.
First steps to supporting GPS