major refactor & add to multiple lists