diff --git a/.gitignore b/.gitignore
index aa44b7c51bbae4d4d64eaa8d49b2ff6d443d0e82..be6ad6b814ef89eb1ca6853c5c1a806b5b7c602f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.org~
 *.so
 *.pyc
 build/*
diff --git a/Makefile b/Makefile
index 4209c331c46c74e9138cd3d98fac5716963e0cac..c2ae2b26511e0355fef167a53eacb002db0f1d2a 100644
--- a/Makefile
+++ b/Makefile
@@ -31,5 +31,3 @@ all: $(OBJECTS)
 
 clean:
 	rm -f *.o *.so
-	find build/ -type f -delete
-	rmdir build/*
diff --git a/README.md b/README.md
index 4684344406ace48a0e830f06dfeff7cf95545bc0..8b8ccdff5ddb04e907f7aad3967c22507c20c1fd 100644
--- a/README.md
+++ b/README.md
@@ -48,22 +48,3 @@ Usage notes
 When running a jupyter notebook and importing binary_c, it might happen that the module binary_c cannot be found. I experienced this when I executed Jupyter Notebook from a virtual environment which didnt use the same python (version/binary/shim) as the one I built this library with. Make sure jupyter does use the same underlying python version/binary/shim. That resolved the issue for me.
 
 Also: I figured that having binaryc output the log like "<LOG HEADER> t=10e4 ..." (i.e. printing the parameter names as well as their values) would be useful because in that way one can easily have python read that out automatically instead of having to manually copy the list of parameter names.
-
-
-
-TODO 
----------------------
-General:
-- ?Put the header and src files in a dedicated directory. 
-- ?Have the compiled files be written into build
-- Get a more reliable way of loading the default values (running a ./tbse echo or something?)
-- make routine that reads out all the lines, splits them into pieces and reads out the correct key
-- Add PYTHONPATH thing to readme
-- Make sure importing binary_c is not a problem
-
-If we're going to do populations:
-- Use sphinx for auto generation of docs
-- Use queueing system/asynchronous task queue
-- Make some parse-data that can be easily used
-- Make some simple script to assign probabilities
-- rebuild all perl stuff into a python grid code.
diff --git a/TODO.org b/TODO.org
new file mode 100644
index 0000000000000000000000000000000000000000..6542d83bbacdab4cd0efb088c0b1021b70f6ffe9
--- /dev/null
+++ b/TODO.org
@@ -0,0 +1,19 @@
+* Todo list for the binary_c-python
+---------------------
+** General:
+** DONE Get a more reliable way of loading the default values (running a ./tbse echo or something?)
+   CLOSED: [2019-10-29 Tue 17:44]
+
+
+
+** DONE make routine that reads out all the lines, splits them into pieces and reads out the correct key
+   CLOSED: [2019-10-29 Tue 17:43]
+** TODO Put header and other source files in a dedicated directory
+** TODO Use sphinx or read the docs for auto generation of documentation
+** TODO Have the compiled files put into a build directory
+** TODO add pythonpath thing to readme
+** TODO make script that will set up binaryc automatically so that this can become an out of the box thing
+** TODO Test the importing of this code from different places
+** Population ideas
+*** TODO Queuing system and some multiprocessing to run many systems
+*** TODO Consider rewriting the work that perl does