Start fleshing out functions with tests