Adding some functionality

#1