Start of Release-1. Get to compile, some basic changes