Added some functionality
Some progress