moved stuff around
added demos