Cleanup
Cleanup
Pre merge commit
First implementation of the full mkdir