Getting very close, need to clean up and delete old stuff