Got subroutes working