ugh
Revert "Removed conflicting functions"

This reverts commit 3ed258f0c57dc3e59c091d15b3b04896a2604b85.
Changed namespace to stop assembly reference errors