Remove String typedef, add basic input handling concept

Remove all references to String typedef, and replace them with std::string
Add very basic (and not working) code for handling input
More changes to timing code