Some progress. I hate this though.