Refactor/Cleanup Spike (broken).