Minor shtuff
Started working on GUI