cat tweaks
initial checkin. heavily-modified from Kyle's solid design.