got rid of one activity! (bugs to fix)