Second commit

Some features were added.