Added form stuff and updated things