organized code better, started working on gui