its working. kinda clean now too.