Better list stuff
Refactored some stuff for Injection