Revert "s7 cleaning"

This reverts commit c76a409a43798e40ed75ce8271de45514a31eadc.
s8 working
Merge branch 's1_mainsimulation_implementation' of https://github.com/tomasaronjonsson/atmsimulator