Added a lot more of the visual stuff