working on getting all non-send functionality working