More bug fixing, trying to get what I've written to work. Making progress!