Added everything I had locally that seemed to fit the bill