Finished with some calculation bugs it seems