Added Image, Activity (in progress) and some tests