Expanded form functions

Made them a little less ugly too. But only a little.