Finished up initial pass on effects