Vastly improved the sample project