Overhaul

Big push from local. Still need to fix leaves. and other minor things.