functionality working; bug testing now