Began laying framework for issue #1 and issue #2 along with some other things.