wip6

well, at least it compiles..