fixed that infinity bug
copied over some files
rename
implementation done, untested