Work/ash

latest changes thursday night.