Add project to solution!
Refactor to support custom commands