FINAL API FUNCIONALITY ADDED :) :) :)