Done some "TODOs", added pagination verification
added pagination verification
Merge branch 'master' of github.com:ATQC047/oms