Once again moving stuff around, and more code