More Finalization

Changed output to use methods to get points