Updated documentation, added TODO with future plans