Done implementing Appendix A, remove hw2d