SSI version of 20140420-fullstack