Finally got stuff working