Added options hash to add() for easier switching
Break tokens out from spine