Finally got stuff working, mecications added in