Crummy way of doing the list population but works

- should be improved eventually.