Tons of additions and ports