rename
initial steps
rough version