Stoppped for today
Tweaked