Closing in to working version, some quirks.