Adding a list, yea it is still ugly