added major overhaul - project redone