v 1.1

Started over. Need to complete.