Removed dependency on StarX and refactored everything.