Refs and such
merge