Added more functionality

Works a little better now