branch code now working, still need to write tests