Demo commit with all stories working

@BeshoSmile