Re-ordered functions, added cases for the LIST request