Lot of updates, working towards removing compiler errors.