Partial fix to shop bugs- incomplete!

This will NOT compile. Don't use this src!