Added some features that are still in "work in process" state.