Forms solution WIP