Added classes and method stubs to outline future work