Partial refactory
Add forms