added GUI, removed some old stuff