Resolved #27 and #28

- Resolved #27, window is now added regardless to preconditions.

- Resolved #28

Jeremy. Allen. Wildsmith