even even more webcat stuff
final commit