snapshot b4 scheffy
After scheffystuff
Most stuff working