Reworked list to get some things to work around a bug with previous implementation