features and processes added, so far seems to be working