Working add but still with some hard codes