Added code for docking. Not complete. Timeout bad