Alright so tap still not working, but cleaned some stuff up