works -- use new method to calc points -- clean up later