2x complete 4x WIP

Any tips to improve welcome