Fixed some isssshhhhhhhhhh while working on front end.  not committing
that change yet because it doesn't compile yet.