first commit
fixed init conflict, hopefully