GUI functional, final touchups still required