Well, it builds at least...  Need to add our tests