[@Polyphemus] Havent had a lot of time to work on it but I've got a little more done