Finished!

Please merge! Doge so happy!