Closes #2 - Grabbing some of that low-hanging fruit on my to-do list