demo mostly mostly done
added more stuff