Initial commit
stable, and I promise smaller commits from here
fixed conflicts