Initial working version of bifrost w/ breaking changes

There are more changes coming
Updated with latest bifrost and last of breaking chnages (for now)