Got some more progress in today... Check it out