Some forms added
More forms work