finalized userstories & schema