Added some future elements, not implemented
More detailed docs of what's working right now