added stuff from other repos into this one