cleaned up
shakie man moves
cleaned up again
fixed merge conflicts