commit my version, half project left