better loader #16
starting to work on #17, need to finish it later