Added return statements

More work needs to be done.