first actual working version!

also remove test versions