Added the ability to add custom options
Started work on ListCallback