Cleaned up some problems from the argument commit. Added branching