remove dockerfile stuff and merge into images

get spinner working. mostly.