Updates for today.. this needs to be cleaned up and duplicate code removed.