Duck Typing Stuff Added
Second attempt to puch this
Further attempt to fix this
Last attempt to fix this merge-conflict
Last attempt to fix this merge-conflict