Also - as mentioned in #13 hardcoded strings should be using lang strings. note - this is a blocker for approval.