Made notes about some structural changes that will have to be made to accomodate #46.