major rewrite to load all forms first