Moved some functions around a bit, stubbed out remarks