Added more outline so I don't forget stuff.