A good improvement on my last time. A lot can be done to improve here as well, but this is something to post until I can do better