Progress on #27 Item 1
Progress on #17 Item 1
Closes #27

Fix for Item 2