diff --git a/doc/papers/presentation-baretto.pdf b/doc/papers/presentation-baretto.pdf
new file mode 100644
index 0000000..cb0ef1b
Binary files /dev/null and b/doc/papers/presentation-baretto.pdf differ
diff --git a/include/codecrypt.h b/include/codecrypt.h
index e4bd316..3917163 100644
--- a/include/codecrypt.h
+++ b/include/codecrypt.h
@@ -4,70 +4,127 @@
 
 #include <vector>
 
-namespace ccr {
+namespace ccr
+{
 
-	typedef std::vector<bool> bvector;
-	//for broken/old/weird STL uncomment this:
-	//typedef std::bit_vector bvector;
-	//TODO ifdef
-	
-	class matrix : public std::vector<bvector> {
+typedef unsigned int uint;
 
-	};
+/*
+ * vector over GF(2). We rely on STL's vector<bool> == bit_vector
+ * specialization for efficiency.
+ */
+class bvector : public std::vector<bool>
+{
+public:
+	uint hamming_weight();
+};
 
-	class permutation : public std::vector<unsigned int> {
+/*
+ * pseudorandom number generator. Meant to be inherited and
+ * instantiated by the user
+ */
+class prng
+{
+public:
+	virtual int random (uint) = 0;
+	virtual void request_seed (uint) = 0;
+};
 
-	};
+/*
+ * matrix over GF(2) is a vector of columns
+ */
+class matrix : public std::vector<bvector>
+{
+public:
+	matrix operator* (const matrix&);
 
-	class polynomial : public bvector {
+	bool compute_inversion (matrix&);
+	void generate_random_invertible (uint, prng&);
+	void unit (uint);
+	void compute_transpose (matrix&);
+};
 
-	};
+/*
+ * permutation is stored as transposition table ordered from zero
+ * e.g. (13)(2) is [2,1,0]
+ */
+class permutation : public std::vector<uint>
+{
+	void compute_inversion (permutation&);
 
-	namespace mce {
-		class privkey {
-		public:
-			matrix Sinv;
-			permutation Pinv;
+	void generate_random (uint n, prng&);
+	void permute_rows (const matrix&, matrix&);
+	void permute_cols (const matrix&, matrix&);
+};
 
-			matrix h;
-			permutation hsys;
+/*
+ * polynomial over GF(2) is effectively a vector with a_n binary values
+ * with some added operations.
+ */
+class polynomial : public bvector
+{
+	bool is_irreducible();
 
-			polynomial g;
-			matrix sqInv; //"cache"
+	void generate_random_irreducible (uint n, prng&);
+};
 
-			int decrypt(const bvector&, bvector&);
-		};
+/*
+ * classical McEliece
+ */
+namespace mce
+{
+class privkey
+{
+public:
+	matrix Sinv;
+	permutation Pinv;
 
-		class pubkey {
-		public:
-			matrix G;
-			int t;
-			int encrypt(const bvector&, bvector&);
-		};
+	matrix h;
+	permutation hsys;
 
-		int generate(pubkey&,privkey&);
-	}
+	polynomial g;
+	matrix sqInv; //"cache"
 
-	namespace nd {
-		class privkey {
+	int decrypt (const bvector&, bvector&);
+};
 
-			int decrypt(const bvector&, bvector&);
-		};
+class pubkey
+{
+public:
+	matrix G;
+	uint t;
+	int encrypt (const bvector&, bvector&, prng&);
+};
 
-		class pubkey {
-		public:
-			matrix H;
-			int t;
+int generate (pubkey&, privkey&, prng&);
+}
 
-			int encrypt(const bvector&, bvector&);
-		};
+/*
+ * classical Niederreiter
+ */
+namespace nd
+{
+class privkey
+{
+public:
+	/*todo stuff*/
 
-		int generate(pubkey&,privkey&);
-	}
+	int decrypt (const bvector&, bvector&);
+};
 
-	//TODO entropy sources
+class pubkey
+{
+public:
+	matrix H;
+	uint t;
 
-} //namespace CCR
+	int encrypt (const bvector&, bvector&, prng&);
+};
+
+int generate (pubkey&, privkey&, prng&);
+}
+
+} //namespace ccr
 
 #endif // _CODECRYPT_H_
 
diff --git a/lib/bvector.cpp b/lib/bvector.cpp
new file mode 100644
index 0000000..635c186
--- /dev/null
+++ b/lib/bvector.cpp
@@ -0,0 +1,11 @@
+
+#include "codecrypt.h"
+using namespace ccr;
+
+uint bvector::hamming_weight()
+{
+	uint r = 0;
+	for (uint i = 0; i < size(); ++i) if ( (*this) [i]) ++r;
+	return r;
+}
+
diff --git a/lib/math.cpp b/lib/math.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/matrix.cpp b/lib/matrix.cpp
new file mode 100644
index 0000000..0e9446a
--- /dev/null
+++ b/lib/matrix.cpp
@@ -0,0 +1,25 @@
+
+#include "codecrypt.h"
+
+using namespace ccr;
+
+void matrix::unit (uint size)
+{
+
+}
+
+bool matrix::compute_inversion (matrix&r)
+{
+
+	return false;
+}
+
+void matrix::generate_random_invertible (uint size, prng&rng)
+{
+
+}
+
+void matrix::compute_transpose (matrix&r)
+{
+
+}
diff --git a/lib/permutation.cpp b/lib/permutation.cpp
new file mode 100644
index 0000000..4b9e8b6
--- /dev/null
+++ b/lib/permutation.cpp
@@ -0,0 +1,25 @@
+
+#include "codecrypt.h"
+
+using namespace ccr;
+
+void permutation::compute_inversion (permutation&r)
+{
+
+}
+
+void permutation::generate_random (uint size, prng&rng)
+{
+
+}
+
+void permutation::permute_cols (const matrix&a, matrix&r)
+{
+
+}
+
+void permutation::permute_rows (const matrix&a, matrix&r)
+{
+
+}
+
diff --git a/lib/polynomial.cpp b/lib/polynomial.cpp
new file mode 100644
index 0000000..59b1c19
--- /dev/null
+++ b/lib/polynomial.cpp
@@ -0,0 +1,15 @@
+
+#include "codecrypt.h"
+
+using namespace ccr;
+
+bool polynomial::is_irreducible()
+{
+
+}
+
+void polynomial::generate_random_irreducible (uint size, prng&rng)
+{
+
+}
+