Refactoring effort complete

Iframes still not working :(