Do away w/ MacGap and replace with more direct web implementation