GUI working, needs polishing and correcting come issues