Fix/overloaded access

Review by @DarkDimius @samuelgruetter

I apologize for the many commits. I have too much on my plate right now to spend time squashing them.