Issue #193 - Worked on the back end with some errors