I am shotting for this week. I am just fixing a few bugs left in the stack