added todo's, and started work on identifier regexes