Streamlining some more stuff, under 4 pages now..