Further additions and testing