Added more functionality

Moving forward in the development. This version is much more stable.