Parse in module

Don't review yet.
same here. Do not comment out code. Either keep it or delete it