Finished implementation, all features working.
Updated to fit split function for better parsing of tokens.