footers added
fixed merge conflict with footer merge
got rid of test comments now for footer merge