Revert "Getting everything together..."

This reverts commit af116df4f0807337a8866995e4c0755edb4b2f5b.