merged in jessicas refactors

now we have 1 activity only much better!