Add error checking on arguments
Add close button, first functional version