Beta v2

Made it a little prettier.