working!!!

changed tags to be better matching, finished this crap after not working
on it all day