fix all
addss all function
test
resolves conflicts
adds final running output
fixes conflicts
try