Slightly better, could use a lot more work still