More Refactoring and the dot thing should work now.