[WIP] - Added FormType
Fixed merge