Begun work on form management controls