1st Version

Haven't tested completely for bugs yet