#30 copying some more files. cannot properly test until #37 is fixed