added alot of stuff, just GUI left