stash
stash 2
cleanup
Using Artk branch on Github
Better error handling for null components
Correcting post-rebase issue