I did much much refactoring, because we want to include this actor and gps tracking thing :D