Added in w or d checking
added in basic account addressing