I fully understand that this code is critical but as of now the implementation is incomplete (ie map not implemented last time I checked).

I think we should at least keep distinct commits while the code is under dev so that it's easier to follow what's going on. Commits are cheap, we can use plenty of them and merge when the code gets ready.