Redo

Breaking down initial project from capstone class, updated some.  More
to follow.