Commits should be small and add small code chunks

[shiryz]

This commit c13b663

Relates to 4 issues, and is writing to several files, this should have been split into several commits