Completed parsing first cut at least and added some options