Few API Directional Changes.. API Soon. ;)