Added APILoader

Added APILoader for toilets & fitness, bug fixes