Added some things from other repos