After much struggling, cleaned slate in preperation for implemeting a much cleaner part 1a