about to change some things
got it working... I think