In Progress

Various PHP edits