and though bugs are the bane of my existence, rest assured the wretched thing will get the best of care here
Created by: josedcs
Creating this PR so that we clean up this branch as well. Looks like we refactored a bit.
