workign stuff
new code