Added some todo's after talking with Donald.