Adds enough functionality to be usable