Initial commit part 2, second day of work