Second bunch of commit, no clean up has done yet