Rewrote entire FS API

CHUIE REMEMBER TO SWITCH BACK TO MASTER