Finished up membership needs testing