#45 Needs a few bug fixes