Work in progress on consolidating modal forms