Merging Updates from devel

major updates. we now have a tui!