Simplified the project a bit.