Working version... GUI needs to be cleaned...