Added distance finding
conflicts resolved
added first draft laser scan. Still confused