More usable, still lots of things to add