initial code
well i did it all, thanks for nothing source control
merge