0.2 Nearly Ready

Added all the stuff that was needed for 0.2 - more or less.