Updated with basic functionality