Huge remaking with lists