Should turn into a fancy update queue soon...