Fixed window object contamination
Clean up
Mockups!
More mockups