Update stuff, get closer to working replace lib