Making prototype work.
Adding new stuff.