Converted to a library project.
Added helper methods that were previously missing