Working on some API idea, stuff currently broken