Added Geo Classes, WIP on Entity