Added solution. Added initial token support.