finished docking station for the day
cheeky reappearing of files to solve merge conflict