Major change to the manifest and friend stuff

Friend stuff is still broken, everything else should work.