Refactor castle class to remove row args flying around