shit fixed a few things and made jar's going to submit