catches up to merge
commits for merge
adds else functionality