v0.5 - Partial GUI making commit [2]