Fixed User include attempt 2 -- forgot to add new files last time