Closes issue #10, still requires integration with front end (i3)