Very early stage of dock/undock implemented
Code clean up & re-structure needed