Werk day

Being up at 6 am on a Saturday is not fun. Yay for internships! I
validated both and fixed both hoping this is what you want!