Adjustments to code and solution to get the projects to build and run

Signed-off-by: Colin Pearce <colindpearce@gmail.com>