Feature/dev iteration 2 dev gui