Trying to polish it up so it looks better for demo