Ripped out Crystal from the PR, it needs some more work on the overall concept.