Begin expanding form functionality
Small step toward form helpers