Adding mashmaker and fileloader, broken commit