working on schema still not sure if correct!