beginning armory ui
merge attempt