New datastructure

Change the datastructure, numbers are a separate table