Added some stuff, rebuilt solution