Fleshes out form a bit more