Temp commit for now
Solved with notes