removing unessecary
Working, and a bit simplified. GUI barely started though...