A few more tweaks, new parts still not fully functional.