Adding stuff (there's bugs, though, and they must be squashed)