Pushed main frame changes for testing.
Fixed merge issues.