Partial commit ... Need to cleanup. #1