I know that you are planning on changing some of this stuff around. Can you a) include some TODO comments and b) update the issues page?