final commit

No more time for now