First real update. Good as is. Might tweak.