90% working just need time
more tweaks