Updated List manager so it should be more dynamic

My R has errors so I couldn't actually test this...but I don't think it
should break anything