Agreed, working on adding all of these