s6 cleaning and adding the track methods to the interface and server
s6 commit merge