oops, added some stuff I was still testing, this should work :)