Some more clean up and attempts to get it working