Latest version from GameJam
Merge branch 'loader'