Woking-version

previous commits cleaned up.