Been really busy but here's an update