With this commit I've made the following progress:
           #HOT-1 Fixed
            #TST-345 Fixed
            Hooray! I finally did it!!!
            (#TST-423, #TST-348) In Progress
            Have implemented the option, but still not covered with tests.