First round of tooling

@saeed
Please review the changes and give me your opinion.