merge in dev stuff