Set up for haiku, also moves some stuff around