Finished the list
Started in on writing tests