Contintue doc and testing