Finished initial work on conditions and effects