Made more changes ot the scheme
Made further changes to schema, hopefully it will soon take form