Added comments of where some code should probably go.