Added current parameter, and index. Closes #1