Tweaking a few things. Still broken.