On branch master (milestone)

- output window completed
On branch master (temp)

- work on refactoring to library