- Kind of working
 Main functionality in place, tweaking to get it to work right