Finish first stab at schema