Attempting to make the form better

This is probably gonna break.