... all working now, making it pretty later