updated for basic functionality working