Think that's it now except for writing tests