having troubles with the form
changed to choices.. this works decently..
merged, and fixed conflicts