implementing new model
icons for everything, horray
adding logging