So many changes

Almost finished, it gets to the end and the server returns null. new
and updated jars too