Squash all the things

Signed-off-by: Phil <pnomolos@gmail.com>