formatted. started implementing nuke logic
fixed merge conflict