added in mako proprietary files
merge in needed files from the n5