Still no schema, but refatored more.