Finished up code, now just needs some testing/eyeballing