Iteration Three

Some new features