I am working on adding both of those things.