compiles again after bugfix
massive reworking in progress, trying to make this super oopy
more work