Nicer looking, pretty much done