Intermediate commit 3

(Still not functional)