Commented out unfinished portions