Changed as per new reqss
Checkpoint! Basic funcitonality on requirements are met - remains to reimplement million case test