A little refactoring and added some functionality
asdf