using classes proudly
merge confilicts solved