Retab entire project

This pull request to is to address issue #47