shits working, final commit