Coding combat

mergin to work on it