getting up to date, demo working