Prep for adding guard
Removed unneeded toJList()
Get ready to remove stateful context
Fixed stateful maps