Now working after lots of cleanup