Major updates to.. everything