Updating todo
Updating docs
Merge branch 'feature/Forms'