added more functionality, need encryption algorithim