Base check-in

 - may still have a couple confusion bugs with tokens
 - to be rework or reverted back to previous version