Started work on string library. Rearranged some includes.