WIP new schema and main class