Finished coding partial module. Need to unit test