Added gap entries and integrated them.
Broke out all major primary form functions into includes files.