final commit. Everything working.