Works now

Not sure how I feel about entire structure.