Initial fork commit

All the stuff I did till now, except now it's on git.