Dev/schema

Schema is complete