wip
Added loading image, renamed classes