Working on the issues listed in in #54