Library Push 2

Added stuff, merged branches