think it works now...no time to properly test yet...