Added GPS class, partilly