Let's just get this usable shall we? (Part 2)