Make and Take move implemented

Massive streamlining over old branch, last commit before merge