refactoring, made a mess, want to work on this on a different computer now, so commiting now, though stuff does not work