Initial commit working version
Minor cleanup