Reworked entire project to work off of dynamic list