Coping code over, not many changes yet