started to change to toAPI methods, big mess!