Commit initial skeleton
Refactor things a bit
implemented support for null items