Slight clean up to start over adding items

Removed initialization of existing items (very hapzardly thrown
together) and begun to properly reinitialize them in an order that makes
sense.