More coding moving and removal.  Adding notes for unfinished functions.