Still not complete, but a LOT of progress done!