Major rewrite targeted iframe - completly new code and added tests