working copy

everything is finally working