Extract to separate class file
move models to SL project
Add icons