Cleaned up code a bit, going to have to create handlers like NEI.  Will do so soon