#2 GUI works, some changes may be done