First part of the second part of the big commit :D Graphics stuff!