Still tweaking things, closer now