currently working out some bugs...