need to figure out list
list needs work, rest should be good to go
Please enter a commit message to explain why this merge is necessary,