Working on formatting (broken)

Do not use, broken commit