Updates form usage, wip