Got everything to compile; solved issue with cyclical dependencies