Set up trail solutions model pending form update
Merge conflicts adjusted