Soc2014 meta refactor upgrade

Add bits to separate file to avoid circular dependecies?