first steps towards a proper schema