Refactor done, now lets move to the next staging(add db support