everything works, now we get to clean it up