Started porting layers/entities