more rearranging, base functionality works now