yet again, fix relative paths
x out tests for now
Merge branch 'stacks'