Added feature dictionary.

Still requires code clean up.
Will be done by next check in