Update sources to the latest version

This is almost a framework yay!