first draft

For some new feature implementations